Tools: Make xen-access test compile in 32 bits mode

Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>
Signed-off-by: Keir Fraser <keir@xen.org>

diff --git a/tools/tests/Makefile b/tools/tests/Makefile
index f4f1169229bc40a0a64e83335f5bfed21a4fe0d6..cc96cd3a7feb7317b3f0a51f90da868d4707a89d 100644 (file)
--- a/tools/tests/Makefile
+++ b/tools/tests/Makefile
@@ -11,9 +11,7 @@ ifeq ($(XEN_TARGET_ARCH),__fixme__)
 SUBDIRS-y += regression
 endif
 SUBDIRS-y += x86_emulator
-ifneq ($(XEN_TARGET_ARCH),x86_32)
 SUBDIRS-y += xen-access
-endif
 
 .PHONY: all clean install distclean
 all clean distclean: %: subdirs-%

diff --git a/tools/tests/xen-access/xen-access.c b/tools/tests/xen-access/xen-access.c
index 4394f8f20302cf432c5d28c6ccf0d08da1873887..033ff8f9624b5be9e5fd27b15e11f1255788211b 100644 (file)
--- a/tools/tests/xen-access/xen-access.c
+++ b/tools/tests/xen-access/xen-access.c
@@ -600,14 +600,15 @@ int main(int argc, char *argv[])
             case MEM_EVENT_REASON_VIOLATION:
                 rc = xc_hvm_get_mem_access(xch, domain_id, req.gfn, &access);
 
-                printf("PAGE ACCESS: %c%c%c for GFN %lx (offset %06lx) gla %016lx (vcpu %d)\n",
-                        req.access_r ? 'r' : '-',
-                        req.access_w ? 'w' : '-',
-                        req.access_x ? 'x' : '-',
-                        req.gfn,
-                        req.offset,
-                        req.gla,
-                        req.vcpu_id);
+                printf("PAGE ACCESS: %c%c%c for GFN %"PRIx64" (offset %06"
+                       PRIx64") gla %016"PRIx64" (vcpu %d)\n",
+                       req.access_r ? 'r' : '-',
+                       req.access_w ? 'w' : '-',
+                       req.access_x ? 'x' : '-',
+                       req.gfn,
+                       req.offset,
+                       req.gla,
+                       req.vcpu_id);
 
                 if ( default_access != after_first_access )
                     rc = xc_hvm_set_mem_access(xch, domain_id, after_first_access, req.gfn, 1);
@@ -617,8 +618,10 @@ int main(int argc, char *argv[])
                 rsp.p2mt = req.p2mt;
                 break;
             case MEM_EVENT_REASON_INT3:
-                printf("INT3: rip=%016lx, gfn=%lx (vcpu %d)\n", req.gla, req.gfn,
-                        req.vcpu_id);
+                printf("INT3: rip=%016"PRIx64", gfn=%"PRIx64" (vcpu %d)\n", 
+                       req.gla, 
+                       req.gfn,
+                       req.vcpu_id);
 
                 /* Reinject */
                 rc = xc_hvm_inject_trap(xch, domain_id, req.vcpu_id, 3, -1, 0);